projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 118a31a ec26c23)
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:29:22 +0000 (14:29 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:29:22 +0000 (14:29 -0800)
commitf15c8583198c3d6c26ca0c0a5b6fb019f98d6c3c
tree7068ac99c5729e94a93a4a0ae7ddd1acbb7d2c01tree | snapshot
parent118a31a3b1eb08cba14887c3134054e9b4383688commit | diff
parentec26c23f4815fbc6bbd16d20f400721bc7b58344commit | diff
Merge from origin/emacs-24

ec26c23 authors.el: Add missing ignored and renamed files
e589765 A more thorough fix for bug#19307
4e8d586 Fix last commit
d6fee01 Tramp: Don't use a tempfile for ControlPath.
27e11c0 Fix display of overlay strings with faces after ellipsis  (Bug#19307)
e9a7e10 Fix redrawing of mode lines when exposed  (Bug#19721)
50f3811 net/tramp.el (tramp-ssh-controlmaster-options): Use "%C"

Conflicts:
lisp/ChangeLog
src/ChangeLog
src/xdisp.c
admin/authors.el diff1 | | blob | history
lisp/ChangeLog diff1 | diff2 | blob | history
lisp/net/tramp.el diff1 | diff2 | blob | history
src/ChangeLog diff1 | diff2 | blob | history
src/dispnew.c diff1 | diff2 | blob | history
src/xdisp.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.